Merge branch 'master' into Bootstrap
Made some visual changes
Merge branch 'Bootstrap'