Added bootbox, a plugin for bootstrap, which allows for easier messages. Also added a searchbox to the navigation bar
fixed minor merge changes