get JSON for form to work
Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

Conflicts:
	app.php