Some stuff
Merge branch 'master' of https://github.com/mjhart/MusicalForum
Set up redirection
Fixed conflicts
Merge branch 'master' of https://github.com/mjhart/MusicalForum