edited update cycle slightly
fixed merger errors
Merge branch 'master' of https://github.com/Redbeard2794/Escape-From-Castle-Hellfire-HTML