Added to database in preperation
Merge branch 'master' into money

Conflicts:
	Expenshare/db.sqlite3
Added functionality in views
Merge branch 'money'

Conflicts:
	Expenshare/db.sqlite3
	Expenshare/share/forms.py
	Expenshare/share/models.py
	Expenshare/share/views.py