first commit, ignore database.yml
bootstrap html
Merge commit '30238a05dce2aad2de25a14b38b98996482a5d9b'