some stufff
Merge branch 'master' of https://github.com/velebak/spaceapps

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.css.scss