getting ready for big merge
adding .gitignore
ignoring the template caching
moving into source
Still working on file upload
It works!
Working on password verification
moving into alpha
added logout.
fixed registration issue
Adding search to nav
Added search back in the nav bar
Merge branch 'marketplace-working' into working

Conflicts:
	.gitignore
	.htaccess
	externals/smarty/templates_c/3a4f6f0d327fc7bc3ea86f63906a1bf934ca50c7.file.footer.tpl.php
	externals/smarty/templates_c/97c13ae6868bbc459509c9f1b968154acd23eecc.file.header.tpl.php
	externals/smarty/templates_c/c0360d049dff10f364dfc53ba2cc3958abf6ee6d.file.index.tpl.php
	includes/EMP.class.php
	includes/js/behavior.js
	index.php
	templates/classified.tpl
	templates/classifieds.tpl
	templates/header.tpl
	templates/home.tpl
	templates/index.tpl
	templates/indexHead.tpl
	templates/registration.tpl