models added + static
This adds my changes!!!!
habit forming and breaking page
Merge branch 'master' of https://github.com/francesding/21days

Conflicts:
	twentyonedays/urls.py