about page
about page merge

Merge branch 'master' of https://github.com/meet-projects/shooksookmegabits-y2-2013

Conflicts:
	shooksook/main/static/css/project.css
	shooksook/main/templates/main/about.html