First commute
Merge branch 'master' of https://github.com/mwcrowley/Portfolio

Conflicts:
	smart.lock