Delete database.yml
Merge branch 'master' of https://github.com/msamuelsson/knowhow
Merge branch 'master' of https://github.com/msamuelsson/knowhow

Conflicts:
	config/database.yml
Merge branch 'master' of https://github.com/msamuelsson/knowhow
Files upload and download, pdf check, edit to be fixed.