working on ajax still
Merge branch 'master' of http://github.com/johnfoley3/cs430
testing
changed file structure
working angular app with internal json object for data
hierarchy restructuring for the sake of in-file paths