changes
Merge branch 'master' of github.com:Fibiola/IncCoaster

Conflicts:
	landing/templates/index.html
	startupweekend/settings.pyc
	startupweekend/wsgi.pyc
Merge branch 'master' of github.com:Fibiola/IncCoaster
breakam slikco