not empty
Merge branch 'master' of github.com:Ixider/DB3

Conflicts:
	spatter/app/controllers/users_controller.rb
Added tweets tables