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

Conflicts:
	framework/node_modules/mysql/Readme.md
	framework/node_modules/mysql/node_modules/bignumber.js/.npmignore
	framework/node_modules/mysql/node_modules/bignumber.js/.travis.yml
	framework/node_modules/mysql/node_modules/bignumber.js/LICENCE
	framework/node_modules/mysql/node_modules/bignumber.js/README.md
	framework/node_modules/mysql/node_modules/bignumber.js/bignumber.js
	framework/node_modules/mysql/node_modules/bignumber.js/bignumber.min.js
	framework/node_modules/mysql/node_modules/bignumber.js/doc/API.html
	framework/node_modules/mysql/node_modules/bignumber.js/package.json