add maps javascript

added the google maps javascript line so that google maps can be called.
Edited git ignore file
Changed .gitignore file

I changed the .gitignore file to allow the new commit. There was an issue
because the merge from master would cause some issue.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bootstrap.js
	bootstrap.json
	resources/css/app.css