redo - gitingore
Merge branch 'master' of github.com:Jegp/ISP2014

Conflicts:
	.gitignore