Added content?
Merge remote-tracking branch 'origin/master'
Added content and summary
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Information.java