Added Google analytics code
Conflicts in JS resolved
Merge branch 'master' of github.com:tleonardi/spaghettieastern

Conflicts:
	js/spaghetti.js