Updated text fields with variables
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype

Conflicts:
	templates/edit.html