fixing .gitignore and pretty stuff for index
merging
Merge branch 'master' of https://github.com/csc456fall2014/team2-pizza-tracker