i might have a problem with files git is tracking or not tracking
this is at test for commit -a

Merge branch 'master' of https://github.com/lukehammer/suduku_slover

Conflicts:
	.idea/misc.xml