Merge pull request #17 from grappler/develop

Seperate html and js from php