this version
fixed about section
Redigned About n stuff
Fixed merge issues
Merge branch 'master' of https://github.com/meet-projects/shooksookmegabits-y2-2013