lets do this
Merge branch 'master' of http://github.com/MrMallIronmaker/ENG100-PortfolioTemplate

Conflicts:
	aboutme.html

idk maybe this will work. it's git commit -a