Merge pull request #1 from jtal/master

missing a div
Started adding PropoalBasics to project (ember working)
Move development back to sqlite3 to make workstation setup easier
Revert "Deploy app to heroku (and migrate to postgres database)"

This reverts commit 5504e189fe27bc226af5d9ef38d4a63675fdde32.

Conflicts:
	Gemfile
	db/schema.rb