Merge pull request #1 from CarolineCaldwell/master

Update Caroline's branch
Add files Info.java and LocationAPIPage.java to controllers.
Merge branch 'Caroline' of https://github.com/CarolineCaldwell/Software_Project.git into Caroline
Merge pull request #3 from CarolineCaldwell/Caroline

Update Caroline's Branch