Merge pull request #1 from AdityaSabnis89/master

master into develop
Set Up
Project SetUp
Merge pull request #2 from AdityaSabnis89/develop

develop to master