Merge pull request #15 from CampusConnect/master

Get latest
-Amrutha's code changes
-gitignore
Merge pull request #24 from shiva404/master

Get latest