line endings
Merge branch 'master' of github.com:IronFoundry/ironfoundry