Resolve merge conflict
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/models.pyc
Commit before merge
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/models.pyc
Added .gitignore to stop committing all .pyc files