heroku test
conflict resolution
Merge branch 'master' of https://github.com/Orkish/heartbeatink
code clean up
update
updated delete button
updated without delete button
sigh
sigh again
updated stuff
updated stuff
updated delete button
test
updated stuff
Update README.rdoc
updated about and created contact page
redo of mailer form
updated contact page
Merge branch 'master' of https://github.com/Orkish/heartbeatink
added message_mailer, changed messages controller, added routes and changed stmp configuration in application.rb