Some random changes
Merge branch 'alex'

Conflicts:
	.gitignore