initial commit
created app and db
added models
testing conflicts
Merge branch 'master' of github.com:evanyeung/HelloSite
removed db and fixed models.py
fix that
Merge branch 'master' of github.com:evanyeung/HelloSite
updated database
update views and urls in both
merge models.py conflict fix
next change
added bootstrap css. Started templating
Merge branch 'master' of github.com:evanyeung/HelloSite
to pull
Merge branch 'master' of github.com:evanyeung/HelloSite
Basic functionality working
add message url and view
merge
navbar working