Merge branch 'master' into gh-pages

Conflicts:
css/style.css
images/colony12_cityscape.jpg
images/colony12_skyline.jpg
images/colony12_web_logo.png
images/colony12_web_logo_2.png
images/colony_12_cityscape.jpg
images/index_mech.jpg
index.html