Trying to work on attachments
Merge branch 'master' of https://github.com/johngriner91/Database

Conflicts:
	ajax.php