HW5 Submission changes

Committed files so that the code here is the same one that was submitted
for HW5.
I thought I just committed these files. Guess not.
Modified .gitignore

Hopefully we can import the project into eclipse instead of creating a
new project every time. Crossing my fingers.
Merge remote-tracking branch 'origin/dev'