Some style fixes to make things line up better.
Added some custom styles, updated colobox.js
editing author
Merged Maged's commits.

Conflicts:
	404.php
	custom-style.css
Merge https://github.com/kan-o-ash/the-cannon
Cannon 2.0
Fixed About Page Template CSS.
Cleaned up more CSS
Changes some comments in mobile.css
About template page ordering is fixed.
Fixed some mobile css issues.
About Page complete.
Slightly Changed secondary menu.
Updated about page and a lot of mobile css.
CSS changes.
- Comment section expanded to 640px
- 30 articles shown on the front page
removing photo
pulled about
- Fixes to abouttemplate.php
- Styling changes
- Added the full width post type. Only works if you have the "Custom Post Templates" plugin installed.