Merge branch 'master' into dev
:octocat: added bootstrap for das grid system

I should learn how to make my own grid system
:octocat: Some grid implementation and a better welcome screen.

gotta give the people what they want.
Merge branch 'dev'