today's code
Merge https://github.com/Hafsa13469/28-Dec-2014