no change
Merge branch 'master' of https://github.com/yaslisari/Aptana

Conflicts:
	main.js
no change
added maps linked to courses.
google api used
Merge branch 'master' of https://github.com/yaslisari/Aptana