8 commits

Author	SHA1	Message	Date
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	4e284d81b7	Handled conflicts, throwing out changes to ladder_tab.coffee.	2014-07-04 17:36:10 -07:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Michael Schmatz	988ad6ffda	Attempting to fix G+	2014-06-24 11:29:43 -07:00
Fergus Leen	88aa8d234c	Facebook friends patch	2014-06-20 02:18:40 +01:00
Michael Schmatz	a1b7025730	Emergency linkedin hot fix	2014-06-19 08:36:22 -07:00
Scott Erickson	ee791da34c	Moved services into their own folder, and made no services run for both testing and demo pages.	2014-06-16 11:40:09 -07:00