Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

Author: chinagoodman

.gitignore

@@ -1 +1,26 @@
+<<<<<<< HEAD
 /bin/
+=======
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+>>>>>>> refs/remotes/origin/master