try to make a conflict
Merge branch 'mine' of github.com:danackerson/ModularSinatraTemplate into trans