improcing styles
Merge branch 'master' of https://github.com/master5o1/pretty-bitnz

Conflicts:
	app/styles/global.css
	app/styles/main.css
	app/styles/styles.css