railsified
gitignoring
Merge pull request #20 from mplaza/melabranchjr

gitignoring
delete DS Store
Merge pull request #21 from mplaza/melabranchjr

delete DS Store
add .DS_Store
deleted ds store
Merge branch 'master' into paulbranch
it works