adding .gitignore file
Merging.
Merge branch 'master' of https://github.com/Schpeyeder/schpeyeder-web

Conflicts:
	.gitignore