abcd
Merge branch 'master' of http://github.com/hessryanm/healthyhabits

Conflicts:
	healthyhabits/home.pyc
	healthyhabits/models.pyc
	healthyhabits/templates/home.html

asdf
added js folder to static path