db
commit
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype

Conflicts:
	app/assets/images/fb.png
	db/schema.rb
contact
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype