Changes made dated 18-08-2014
Merge branch 'master' of https://github.com/shokatsaifi/mysite