add real collaborator information for githubstudent
Merge remote-tracking branch 'origin/master'
update first.txt from web-UI
commit from local, changes to first and last lines
Merge branch 'merge-conflict-example' of https://github.com/githubstudent/newproject into merge-conflict-example

Conflicts:
	first.txt
Merge branch 'merge-conflict-example'
class is now advanced