gitignore
Merge branch 'master' of https://github.com/amandziy/StartItUp

Conflicts:
	.gitignore
Done some work