commiting changes
commiting
Merge branch 'master' of https://github.com/danielcalencar/pubshare

Conflicts:
	gen/.gitignore
accepting changes from upstream
Merge http://github.com/danielcalencar/pubshare
Completing the flow of evaluation activities
Merge pull request #11 from danielalencar/master

Completing the flow of evaluation activities