-- gitignore
Merge branch 'master' of https://github.com/tenderbolton/farq2014

Conflicts:
	farq2014/bin/data/appSettings.xml
-- oscImput