removed watcherTasks.xml from version control
Merge branch 'master' of github.com:turban0/hax

Conflicts:
	.idea/watcherTasks.xml
Removed watcherTasks.xml from version control