Internship-Task v1.1

Updated 12/11/2014
Revert "Internship-Task v1.1"

This reverts commit 311ae20f8810fc2ab378d2e0c05e7d0decc07e91.