Fixed merge issue
Merge branch 'master' of https://github.com/hackforwesternmass/literacy

Conflicts:
	literacy_network/templates/edit_profile.html