New color scheme
Merge branch 'master' of https://github.com/Brennan-M/ExpenShare

Conflicts:
	Expenshare/db.sqlite3