adding scaffold for... well just about everything
adding bootstrap.
resolving merge conflicts
Merge pull request #3 from lexh/master

Adding bootstrap, scaffolds