Removed unneeded bootstrap include
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update logic
Merge pull request #48 from jerv13/master

Update logic on login page