Fixed missing heading from messed up merge
fixed up some bootstrap formatting (rows/spans)
Merge pull request #269 from Skud/redesign-homepage

Redesign homepage