project
Merge branch 'master' of https://github.com/redneckz/cgminer

Conflicts:
	cgminer.sublime-workspace
ignore