Fixing merge problem
Merge branch 'master' of https://github.com/hackforwesternmass/literacy

Conflicts:
	literacy_network/views.py
Merge branch 'master' of https://github.com/hackforwesternmass/literacy