NOT COMPLETE
NOT COMPLETE
NOT COMPLETE
Merge branch 'master' of https://github.com/evanstoddard/REST-Easy

Conflicts:
	.DS_Store
	admin/index.php
	classes/class_database.php