1
Merge branch 'master' of https://github.com/alexec/www.alexecollins.com

Conflicts:
	source/layouts/layout.erb