Merge pull request #1 from jameshume/master

Changes to login and main page
trying to merge...
test
...
Merge branch 'master' of https://github.com/sp0ngey/TripApp

Conflicts:
	app/views/application/_authentication.erb
test2
Merge pull request #2 from jameshume/master

Loads of updates now. There is the login, trip adding/remove/edit and trip planning
Merge pull request #3 from jameshume/master

Adding the shared directory and a few other changes
basic searching of all trips

searches keywords in trip, trip_items and locations tables
First save after merging in Sams latest changes. Changes made to fix merge conflicts. Also change CSS and application.html.erb so that the search box is right aligned and the top bar displays more neatly