Initial rails app
in the middle of Foundation demo
Fix merge conflicts