some moving around of files for patterns I've used before with middleman and karma
Merge branch 'master' of https://github.com/jcono/timeline

Conflicts:
	frontend/source/index.slim
changed the paths on the index file