edited layou files
Merge branch 'master' of https://github.com/aarya123/CampusFeed

Conflicts:
	gen/com/example/campusfeed/R.java
	res/layout/activity_event_info.xml
	res/values/strings.xml