Merge pull request #2 from mstfyldz/master

integrated bootstrap