more javascript stuff
Merge branch 'master' of https://github.com/manningjr/CSCI-3950-Mobile-Applications

Conflicts:
	MLC App/MLCLanguageLab.html
Merge branch 'master' of https://github.com/manningjr/CSCI-3950-Mobile-Applications