Merge pull request #12 from mfrancis95/master

Pulled from master
Merge pull request #13 from mfrancis95/nelson

Merge pull request #12 from mfrancis95/master
Insignificant changes to UIPane

Delete the gitignore if you want.
Added ItemEntity idea to designnotes
Entities can now have multiple actions per turn. Gave Survivor 3 movements per turn as a test. Also gave Survivors the ability to pass by pressing 'p'.
Update designnotes
Update designnotes
Added a Barricade Entity and added two of them in the world.
Merge origin/master
Changes to GraphicButton

made it so when you hover over another button it won’t interfere with
clicked button.
Merge branch 'master' of https://github.com/mfrancis95/Zambie-Survival

Conflicts:
	.gitignore
Merge branch 'master' into ross