commiting so i can pull upstream
fixed merge conflicts
seed file with 10 tiyers
Merge pull request #15 from jimrambow/master

Paperclip added with dependencies.
Merge pull request #16 from jimrambow/master

added validation to name first and last, github, and tiy_type
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team1
Merge pull request #17 from jimrambow/master

Changed readme.rdoc file for more accurate description.
stylings for home page, have create and show page now
Merge pull request #18 from aelevy44/master

styles home page some, addes create.html and show.html
adds bootstrap
fixes merge conflicts
Merge pull request #19 from rphuber/bootstrap

adds bootstrap
removes merge conflict error on main.scss
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap
Merge pull request #20 from rphuber/bootstrap

Fixes main.scss
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team1
added attributes to tiyer table, whitelisted them, added them to seeds
Merge pull request #21 from gtlaserbeast/master

Seeds/extra tiyer attributes/etc