lol
Merge branch 'master' of https://github.com/asidhu/sbu-igvc-2014

Conflicts:
	log/console.log