Removed cache and logs from repository -- (they are causing conflicts and are do not need to be tracked)
Merge branch 'master' of https://github.com/snipertomcat/jobeet2 into TheDesignAffiliatesInc-master

Conflicts:
	.gitignore