Removed my commented out and useless code
Merge remote-tracking branch 'origin/master'