finish this
Merge branch 'master' of https://github.com/chrischris292/ShowMeTheMoney

Conflicts:
	package.json