changes
Merge branch 'master' of https://github.com/mhlick/FirstTry

Conflicts:
	src/slim/index.slim