Merge branch 'master' of https://github.com/netlinksclubs/devFest

Conflicts:
	public/stylesheets/screen.css