Re-add Jasmine
Fix paper placeholder div
Make pop up look nice
Done for day
Small change
Merge branch 'master' of github.com:lydianimosa/dream-is-destiny

Conflicts:
	app/assets/stylesheets/application.css
	app/views/welcome/index.html.erb
	jasmine/spec/application-spec.js