Merge pull request #12 from Peppe-/master

Merging from Peppe- <3
Merge pull request #13 from Peppe-/master

Game view and jQuery for offline use
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'