Pull Request #2 - Brian Wang - CS378 (Fall 2014)

Recommitting on the request of Jack. Removed generated files, editing .gitignore to accommodate accordingly.

Final code submission at the request of Matteo, CS378 Fall 2014.