first commit
use pg
add the rest of the twitter omniauth stuff
email not username
ignore vim swapfiles
add username field
:)
add oauth avatars add mojis to ussers
use oauth avatar
fix avatar
fix moji controller
users#show
show who made the moji
users show
 add twitter bootstrap and rspec and stuff
dont initialize on precomple assets
add japanese
more stuff
add kaminari
Merge branch 'master' of heroku.com:kaomojiworld

Conflicts:
	Gemfile
	Gemfile.lock