need to pull - gitignore
Merge branch 'master' of https://github.com/AshtonO/TonysPizza.git

Conflicts:
	CS414A5/bin/.gitignore