Progress
Merge branch 'master' of github.com:mummify/madebynortheastern.com

Conflicts:
	.gitignore