fake index
commiting rails app to development
Merge branch 'development' of https://github.com/iwoodruff/global_conscience into development
hopefully this fixes merge issues