Merge pull request #1 from r3bhatta/master

Trial commit
Edited again x2
Added new task screen, along with some transitions