Initial Commit
Second Commmit
Merge branch 'master' of https://github.com/duncanstrong/habitsapp
Adds Sinatra app skeleton files.
Adds migrations, models and associations for Users, Habits and Adoptions.
Adds actions and erbs for v1 features of app
Second Commit
auth done
Adds new habit creation form to erbs
Third Commit
Fourth Commit
Fifth Commit
auth completed
design draft1
design draft 2
Adopt a habit features partially implemented.
Merge branch 'master' of https://github.com/duncanstrong/habitsapp
Untested implementation of habits adoption end-to-end.
Merge branch 'master' of https://github.com/duncanstrong/habitsapp

Conflicts:
	app/views/habit/adopt/result.erb
Fixed up the adoption result page.