removed project settings from git
Removed xml settings
Merge branch 'master' of https://github.com/tombnorwood/avkoptionsmath

Conflicts:
	.idea/workspace.xml