Menu update
Merge branch 'master' of https://github.com/LockDog/Pilligrim
Switched bootstrap to 2.3.2
Merged
Merge branch 'master' of https://github.com/LockDog/Pilligrim