Initial commit
Merge branch 'master' of github.com:seyDoggy/www-git-workflow

Conflicts:
	.gitignore