Making changes
Merge branch 'master' of https://github.com/nategunn/itc210-earthship-seattle

Conflicts:
	index.php