Merge pull request #11 from alazenby/master

Columns fixed, merging stuff with Murphy
Made a few more changes to my pages.
Mostly finished the mockup of my pages.
Merge pull request #12 from ghuitster/master

Mostly finished my pages
Changing map
Map sort of working.
Missed a thing
Got rid of black
Merge branch 'master' of https://github.com/murphyrandle/Arch
Made a small change to my css file.
Merge pull request #13 from ghuitster/master

Small css changes
Merge branch 'master' of https://github.com/murphyrandle/Arch