test
Merge branch 'master' of github.com:deegill/36weeks into example_branch

Conflicts:
	baby2.0/baby20/views/home_view.py
Merge branch 'master' of github.com:deegill/36weeks into example_branch
removing pyc files
Removing old files.