account settings
Merge branch 'master' of https://github.com/aarya123/CampusFeed

Conflicts:
	project.properties
added new files