local changes
Merge branch 'master' of https://github.com/claydiffrient/cs313

Conflicts:
	includes/style.css