Added gitignore, removed .idea folder
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   .gitignore
#	deleted:    .idea/copyright/profiles_settings.xml
#	deleted:    .idea/libraries/Desktoplibs.xml
#	deleted:    .idea/libraries/Mainlibs.xml
#	deleted:    .idea/libraries/gdx_backend_lwjgl.xml
#	deleted:    .idea/libraries/gdx_backend_lwjgl_natives.xml
#	deleted:    .idea/libraries/gdx_natives.xml
#	deleted:    .idea/misc.xml
#	deleted:    .idea/modules.xml
#	deleted:    .idea/scopes/scope_settings.xml
#	deleted:    .idea/uiDesigner.xml
#	deleted:    .idea/workspace.xml
#
Merge branch 'master' of https://github.com/Rimdeker/Gaem

Conflicts:
	Main/src/com/rimxjoe/Game.java