Develop

This is the version that's currently on coderaising-ethan.herokuapp.com  It should be pulled onto a staging branch first to test out the db migrations etcetera.