7 commits

Author	SHA1	Message	Date
Scott Erickson	0499cddbe6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-04 08:56:29 -08:00
Scott Erickson	c4bfcd5c2d	Refactored portraits to be built in sprite sheets separately.	2014-01-04 08:55:12 -08:00
Mischa Lewis-Norelle	c35cd3437f	Added a bunch of names ... Added a bunch of names, will come up with more tomorrow and add them in the evening.	2014-01-03 23:28:09 -06:00
Scott Erickson	56fa98e76b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-03 14:31:27 -08:00
Scott Erickson	594b54a40e	Can now set admin permissions on the dev environment.	2014-01-03 14:28:00 -08:00
Nick Winter	ffebe45267	Updated uglify-brunch options to not break on for(;;).	2014-01-03 13:49:36 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00