Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ... Conflicts: src/models/user.js views/shared/modals/index.jade		2013-12-31 08:04:51 -07:00
..
index.jade	bosses: no models, performance improvements	2013-12-23 14:17:08 -07:00
inventory.jade	Merge remote-tracking branch 'origin/sabe/rebirth' into develop	2013-12-31 08:04:51 -07:00
stable.jade	Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency	2013-12-23 01:19:18 -07:00