changed git ignore
git ignore up
some type of merge
Merge branch 'master' of https://github.com/Kaybass/CSI-120-midterm

Conflicts:
	public/app.css