git ignore
refactoring
refactoring
Merge branch 'master' of http://github.com/atecle/pa5

dang.