Merge pull request #6 from Rgti2013/master

Update my local repository
gameplay finished
Merge pull request #10 from nejc92/master

gameplay finished