Upgrade Bootstrap and Bootswatch to 3.0.0
Update CSS classes for Bootstrap 3
Fix the navbar HTML for Bootstrap 3
Update HTML to use Bootstrap 3's grid system
Fix the well styles on the projects page
Fix the glyphicons by including the standard Bootstrap 3 stylesheet
Remove the extra margins on the 404 page
Remove some styles to simplify the look a little
Use a list group for the links on the home page
Fix the email link on the home page
Use pills for the sidebar nav on the projects page
Remove some unnecessary width and height properties
Merge branch 'master' into bootstrap-3

Conflicts:
	index.html
Update Bootswatch to 3.0.2 and Bootstrap to 3.0.3
Remove the (broken) labels from the projects page
Merge branch 'master' into bootstrap-3

Conflicts:
	css/main.css
	index.html
	projects.html
Fix labels on the projects page
Merge branch 'master' into bootstrap-3

Conflicts:
	css/main.css
	projects.html
Merge branch 'master' into bootstrap-3
Merge commit '54c7d5d' into bootstrap-3