Added bootstrap
Merge branch 'master' into add_bootstrap

Conflicts:
	Gemfile.lock
Merge pull request #22 from bfosberry/add_bootstrap

Add bootstrap