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
find a issue #7
Merge pull request #9 from wlu-mstr/master

find a issue #7
change ignore file
Fix issue #7
Merge pull request #10 from wlu-mstr/master

fix issue #7
Add user role front page.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	db/development.sqlite3
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/5b32b85db76e8c421b496d42edc9b5ed
	tmp/cache/assets/development/sprockets/6648e441786ceb36e07cf6f915f7005b
	tmp/cache/assets/development/sprockets/87e007bec6a8fc445721c772aba49ba9
	tmp/cache/assets/development/sprockets/a861ba05c32faa85fb9b7abdc8b8f086
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d652dfb9c8bc3885eb4f02920f6e3792
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/ec492eeb7f9e8d64affc1fda5e82504d
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid