adds bootstrap to project
Merge branch 'ilana'