add main email
change color
change mail group for testing
resolved conflicts
add anhancements
Merge branch 'master' of https://github.com/mahinder/Death_by_a_thounds_cuts