first commit
add slim-rails to project
convert erb to slim
resolve conflict