Merge branch 'master' of github.com:tjblonsk/third_project

Conflicts:
	config/routes.rb
	db/schema.rb
updated schema file
Merge branch 'master' of github.com:tjblonsk/third_project into tjblonsk-master

Conflicts:
	config/routes.rb
	db/schema.rb
started styling
moved html and css to ideas, added header and footer to application.html.erb
user can add and save ideas
ajax calls working for comments and new ideas