changed the css for the conditions dislay #273
added bootstrap to login form #275
Merge pull request #283 from notionparallax/feature-275

Feature 275