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

Conflicts:
	framework/views/newtest.jade