Initial commit, file structure, Guardfile basics
Fixed merge conflict