Merge pull request #1 from sole/master

fill this in with actual info about the project
Merge pull request #2 from sole/master

remove locale from urls
Merge commit '4b55ea52e00e4467a814a06993d6e0ec8af20974'