test change
tests
Merge branch 'master' of github.com:jasonwill/son-of-calamari

Conflicts:
	src/app/home/home.tpl.html
Merge branch 'master' of github.com:jasonwill/son-of-calamari