Revert "Merge branch 'master' of https://github.com/justinyangusa/angelhack"

This reverts commit 1df80238001a6478f41225d75c7d1ab5b831b6d5, reversing
changes made to 59b6d4ce8a37f2a3845d7f4c73d7ef76c8711439.

Conflicts:
	framework/app.js