Reworking my fork, making sure it works.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
commiting so i can pull upstream
fixed merge conflicts
Merge remote-tracking branch 'upstream/master'
added the paperclip gem and dependencies for it.
Merge pull request #15 from jimrambow/master

Paperclip added with dependencies.
added validation to name first and last, github, and tiy_type
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
changed readme.rdoc file for more accurate description.
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