Scott Erickson 308adec7c7 Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade		2014-04-11 22:52:00 -07:00
..
User.coffee	Merged	2014-03-16 10:06:47 -07:00
user_handler.coffee	Merge branch 'master' into feature/jsondiffpatch	2014-04-11 22:52:00 -07:00
user_schema.coffee	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00