Update semester to Sem 2 2013
Merge branch 'master' of github.com:bjosey/What-s-In-There into bjosey-master

Conflicts:
	js/magic.js