Merge pull request #6 from Chenyijun/master

Mailer
added about page and fixing input form
fixed merge conflict for input.rb
Merge pull request #5 from maggieli321/master

pull from maggie