fixed my random js bugs, yippee kai-yay!

Signed-off-by: Daniel Vaughan <dvaughan1616@yahoo.co.uk>
more random bug fixes -_-

Signed-off-by: Daniel Vaughan <dvaughan1616@yahoo.co.uk>
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck

Conflicts:
	js/main.js

bug fixes everywhere