make search function properly, add basic styling to login/register pages, add styling to alerts
Fixing merge conflicts
Merge branch 'slacker87-master'
Merge branch 'master' of github.com:FarmBot/OpenFarm