added entry index test
Merge pull request #12 from ospreys-2014/login-logout

Login logout
added search form
added controller for searching
added route to search
removed non-working tests
added entry index test
added search form
added controller for searching
added route to search
removed non-working tests
Edited welcome message
Merge branch 'tests' of https://github.com/ospreys-2014/Lil-Wayne into tests
Merge pull request #13 from ospreys-2014/tests

Tests
added button to link to search and made seach only return results if not nil
Merge pull request #14 from ospreys-2014/tests

added button to link to search and made seach only return results if not...
Edited welcome message
Merge branch 'CommentFix' of https://github.com/ospreys-2014/Lil-Wayne into CommentFix

Conflicts:
	Mac_Overflow/app/assets/stylesheets/application.css
Merge pull request #15 from ospreys-2014/CommentFix

Comment fix
Removed space from code that was causing an error in rspec