Coffee classes U1A2
Merge branch 'master' of https://github.com/vampaynani/oda

Conflicts:
	U1A2/js/oda.js