Setup includes tests
Merge branch 'master' of github.com:Iteam1337/receipter

Conflicts:
	test/app.html
	test/controllers.html