Merge pull request #2 from mkl-qa/master

merge from Grant's data dic codes
add ignores
Merge branch 'master' of https://github.com/wlu-mstr/HR-Recruitment-Sys

Conflicts:
	log/development.log
change ignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	log/development.log
delete the tmp folder
 Please enter the commit message for your changes. Lines starting
Merge pull request #6 from wlu-mstr/master

update: rm tmp folder