merged with master
added ideas_tags joint table
Merge branch 'master' of github.com:tjblonsk/third_project into tjblonsk-master

Conflicts:
	config/routes.rb
	db/schema.rb