deleted css scaffold file
Merge pull request #7 from tjblonsk/master

fixed devise log in. users can add username and bio
trying to fix the css heroku problems
checking to see if this works
formatting css blah
formatting
Merge branch 'tjblonsk-master'

Conflicts:
	app/assets/javascripts/user.js
	app/assets/stylesheets/idea.css
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	app/views/users/_idea.html.erb
	app/views/users/show.html.erb
asset precompile
Merge pull request #9 from tjblonsk/master

seed file functioning
some edits
edits
committed deleted files