committing before pull
Merge branch 'master' of https://github.com/nani282828/pyteam

Conflicts:
	weber/home_func/urls.pyc
	weber/home_func/views.pyc
at profile view