error luetaan jee
r Please enter the commit message for your changes. Lines starting
r
Merge branch 'master' of https://github.com/Odingod/Spaceapps

Conflicts:
	static/js/formrenderer.js