nathanmentley/cosc481-frank-placemap — pull request #2 by fsuarez2005 (2011-10-17 23:30:06+00:00)
Title: pull will just fast forward

I cloned your repo and pulled mine into it. It just fast-forwards and it compiles cleanly.

I add .gitignore so we don't have to worry about class files, backup files, or Configuration.java getting added.