Merge branch 'master' of https://github.com/billperegoy/workbook
Style changes
Merge branch 'master' of https://github.com/billperegoy/workbook

Conflicts:
	app/assets/.DS_Store
Added production database using postgres.