fix conflict with bootstrap 3
Merge pull request #28 from maxgalbu/fix_bootstrap_conflict

Fix conflict with bootstrap 3