Figuring stuff out
Merge branch 'master' of https://github.com/specialeyes/d3team1

Conflicts:
	js/main.js