dev
Merge branch 'master' of https://github.com/davidtsuji/countmein.io

Conflicts:
	app/client/scripts/app.js
	app/client/scripts/index.js
	app/client/scripts/services/main.service.js
	package.json