test
Merge branch 'master' of github.com:johnfoley3/CS430 into iss1
removed test.txt
starting to work on post
Merge branch 'master' of github.com:johnfoley3/CS430 into iss1

Conflicts:
	app/js/controllers.js
ready to test insert person ajax
modified insert_person,php for test
successfully receive feedback from php script
test to return decoded json object