fix merge conflict loss
add support for bootstrap modal on login button
Merge branch 'master' of github.com:AbleCreates/top2