Scott Erickson fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master ... Conflicts: app/models/SuperModel.coffee		2014-03-26 14:29:16 -07:00
..
profile_view.coffee
settings_view.coffee
unsubscribe_view.coffee
wizard_settings_view.coffee