Switched some stuff

made the whole thing more consistent
Merge branch 'master' of https://github.com/kristiankyvik/messageboard