Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge pull request #9 from jtrope89/master

Adding Maps and a bunch of JS logic
fixing issues
Merge branch 'master' of github.com:dyep49/time-midpoint into development
praying git issues resolved
still fixing
fixed google api key
Merge pull request #12 from dlopezh/master

fixed google key thingy