Merge pull request #1 from RMARomero/Bas

Initial Commit
Merge remote-tracking branch 'origin/Bas'
Merge remote-tracking branch 'origin/Bas'
commiten unsynced changes?
forgot something
new fixes
trying to fix this
Revert "trying to fix this"

This reverts commit c85b0f99e81a9b2633de13af3be1a815232a772b.
Revert "Revert "trying to fix this""

This reverts commit 2bf4bbcc85c4c4eb93426ffd417758eb254bc397.
Revert "forgot something"

This reverts commit 129a6f0de16e8300e6a7c4c4bc3c56d48a9c3a76.
blabla
deleted all

byebye
and... its back

backup back up =D
Commiting some extra stuff in the debug folder
Some extra stuff that needs to be added before switching to another branch
It is gone again...on the master!

removing the messed up build environment
And it is back again....the master

Added the backup again.
Testing new comits and synch
Rest Option Implemented

Player is able to rest to regain his health. Only useable if no monster
is nearby.