nada
fix conflict
Merge branch 'master' of github.com:dereksilverman/Future.me
Merge branch 'master' of github.com:dereksilverman/Future.me
rake db, get rid of normalize and foundation in app/index
fix merge conf