Merge pull request #5 from MarkusHackspacher/master

pep8 and fault #4 fixed
Merge pull request #6 from MarkusHackspacher/master

add shebang
Merge pull request #7 from MarkusHackspacher/master

rename map in generalmap
Changed references to map
Updating graphics from android branch
Reorganizing to sync with android structure.
Committing previously ignored bmps
Committing previously ignored bmps
gitignore update
Merging from android branch
Merging from android branch
Merging from android branch
Merging from android branch
Merging from android branch
Debugging from android merge
Debugging from android merge
Debugging from android merge
Basic map movement stable