Merge pull request #3 from aruprakshit/task_c

Task c
Iteration C4 done
iteration c5 completed
caching disabled for developement mode
Iteration D1 completed
Task D completed
Merge branch 'master' into task_c