first commit
Merge branch 'master' of git://github.com/FOSSRIT/surf-2013
Merge branch 'master' of git://github.com/FOSSRIT/surf-2013

Conflicts:
	README.rst
Merge branch 'master' of git://github.com/FOSSRIT/surf-2013

Conflicts:
	README.rst
Merge branch 'master' of git://github.com/FOSSRIT/surf-2013

Conflicts:
	README.rst
Merge branch 'master' of git://github.com/FOSSRIT/surf-2013
Is it going to work this time?
Merge branch 'master' of github.com:FOSSRIT/surf-2013