Make Kritin's javascript a bit more legit
Merge branch 'master' of https://github.com/nadvamir/GU2013-IS3