more stuff
Merge branch 'master' of https://github.com/kevinhamiltonsmith/breaking-trail

Conflicts:
	breaking-trail/breaking-trail.html