Added Bootstrap
Merged conflict resolved
Merge pull request #1 from otorres86/master

new UI work