Just a bad manipulation undone
Merge branch 'master' of https://github.com/vdemotz/IntroDBProject

Conflicts:
	.gitignore