new categories!
Merge branch 'master' of https://github.com/CSE512-14W/a3-moreau-ujaved

Conflicts:
	a3.html