google maps component added
Merge branch 'master' of https://github.com/jakupllarif/Senior-Project

Conflicts:
	SeniorProject/SeniorProject.userprefs
Merge branch 'master' of https://github.com/jakupllarif/Senior-Project

Conflicts:
	SeniorProject/SeniorProject/SeniorProject.csproj