Merge pull request #6 from Chenyijun/master

Mailer
added about page and fixing input form
fixed merge conflict for input.rb
Worked on schedule
Merge branch 'master' of https://github.com/Chenyijun/hackcmu2014
Merge branch 'master' of https://github.com/maggieli321/hackcmu2014
ehh