Editing goals and creating goals based on others
Merge branch 'master' of https://github.com/VoltronForceV/attaboy

Conflicts:
	routes/goal.js