Merge branch 'master' into Saumya
Pages 2
Page 2&3 of Speedbuild
Merge branch 'Saumya'
remove left
Merge branch 'master' into Kevin

Conflicts:
	assets/javascript/main/stub.js
	assets/stylesheets/sections/_header.scss
conflict