controllers, models stuffs
fixed migration error with devise
added basic attributes to user table
resolved merge conflict in models
boilerplate welcome index
User can create acct, removed superfluous test folder
added default devise views
added app-specific user fields to signup form, fixed seeds
style changes to user forms
fridays work
added category controller
fixed merge conflicts
fixed merge conflicts
added join tables categoies_words and lists_words
added user profile page, welcome page user profile partial
some prettiness on welcome page
Merge branch 'development' of github.com:trivett/tangochan into development
merge conflicts
merge conflicts fix
fix