got logging in to save
Merge branch 'master' of https://github.com/master5o1/pretty-bitnz

Conflicts:
	app/scripts/controllers/settings.js
	app/scripts/min/scripts.min.js