error handling in heroku
delete application.css
changes the application.scss
changes the application.scss
merging with heroku
add twitter handle and picture to faker
added 3 new links to homepage: contact link in the footer, signup link in the middle of the page, and browse more speakers after our new speaker gallery
merge conflict solved
merge conflict solved
merging
fixed indentation on homepage and syntax errors
Merge branch 'master' into newlinks

Conflicts:
	app/views/dashboard/index.html.erb
added clarification in placeholder for media field so that user knows to add http:// for their links
css background white changing
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
added footer text and links
Merge branch 'master' of https://github.com/rubymonsters/speakerinnen_liste
removed images
delete s modify css
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste