updates
Merge branch 'master' of https://github.com/williamdingwall/stage-teamsnap-dev
Merge branch 'master' of https://github.com/williamdingwall/stage-teamsnap-dev
CSS tweaks
Merge branch 'master' of https://github.com/williamdingwall/stage-teamsnap-dev
Hero and text changes
Merge branch 'master' of https://github.com/williamdingwall/stage-teamsnap-dev
updates
update
fixed conflict?
Fixed the messed up SH!T