took out admin dashboard
fixed merge

Merge branch 'master' of https://github.com/albertjou/burningairlines

Conflicts:
	config/database.yml
fixed merge again

Merge branch 'master' of https://github.com/albertjou/burningairlines

Conflicts:
	config/database.yml