???
Merge branch 'master' of https://github.com/jesserosato/jaams-web

Conflicts:
	README.md
	forms/controllers/JAAMSForms_Input.class.php
	index.php
Merge branch 'master' of https://github.com/jesserosato/jaams-web
Uhm.
Finished error stuff ... kinda
made more changes to things and stuff.
Working commit
Working Commit.
Merge branch 'master' of https://github.com/Anthoknee/jaams-web into anthony

Conflicts:
	index.php