newsfeed layout design
.gitignore project.properties
gitignore and merge
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/project.properties