changed views.py
Merge branch 'master' of https://github.com/lpatmo/codebuddies-hangouts

Conflicts:
	app/views.py
	app/views.pyc
Merge branch 'master' of https://github.com/lpatmo/codebuddies-hangouts

Conflicts:
	app/forms.pyc
	app/views.pyc
Merge branch 'master' of https://github.com/lpatmo/codebuddies-hangouts
changed choiceces