Update - Changed colors and added Choices
Merge branch 'master' of https://github.com/jiver/finex

Conflicts:
	public/css/styles.css
	public/index.html

Merging with Jiver's changes