Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 Explicit paths specified without -i nor -o; assuming --only paths...
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   resources/Attacks.nam
	modified:   resources/Hostile.nam
	modified:   resources/Items.nam

 Changes not staged for commit:
   (use "git add/rm <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    bin/.gitignore
	modified:   bin/io/github/omn0mn0m/dungeoncrawler/Game.class
	modified:   bin/io/github/omn0mn0m/dungeoncrawler/entity/Hero.class
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

        modified:   resources/Attacks.nam
	modified:   resources/Hostile.nam
	modified:   resources/Items.nam

 Changes not staged for commit:
   (use "git add/rm <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    bin/.gitignore
	modified:   bin/io/github/omn0mn0m/dungeoncrawler/Game.class
	modified:   bin/io/github/omn0mn0m/dungeoncrawler/entity/Hero.class
Merge pull request #2 from katzekitteh/master

Added items, entities and actions.