Inital Rails commit
Merge branch 'master' of github.com:djthompson/acelix-test2