I added my irc username
Merged - RAMstush
merged AGAIN
Merged for the fourth time.
Merge branch 'master' of github.com:FOSSRIT/surf-2013

Conflicts:
	README.rst
Merged for the sixth time.
Merge branch 'master' of github.com:FOSSRIT/surf-2013

Conflicts:
	README.rst