Create profile
Merge branch 'master' of https://github.com/NathanielWroblewski/OmNom

Conflicts:
	omnom/main/templates/home.html
	omnom/main/views.py