Ingoring files.
Merge branch 'master' of github.com:drekka/dNodi

Conflicts:
	.DS_Store