newsearch
fixing the tmp and log directory gitignores
fixed the template a little
Merge branch 'master' into search_page

Conflicts:
	app/views/home/index.html.haml
added more local changes
added more local changes
Merge branch 'master' into search_page
made the main page
added one more test
searchpage2
cleaned up temp files
changed the ui
cleaning up temporary files, consolidating changes
Cleaning up the temporary files and removing now obsolete stylesheets
added gitignore to prevent tracking of .idea, .bundle and .rspec directories
integrating back the gitignore file from my branch
Merge branch 'search_page' of https://github.com/foxish/AggieExperts into search_page
added seed data for the profiles, pkeywords and keywords tables
added seed data for the profiles, pkeywords and keywords tables
Updated the search controller to track the previous search term, updated the view to remember it.