fixes merge conflict
fixes merge conflict
removes bootstrap and adds in foundation
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap
removes the duplicate creation of profile page
Merge pull request #22 from rphuber/bootstrap

Installs foundation and removes bootstrap
commiting to pull upstream
fixes error with the rails compiling of sass
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap
added foundation to the homepage
Merge pull request #23 from rphuber/bootstrap

Sass compiler
fixing merge conflict
added styling to the homepage
Merge pull request #24 from aelevy44/master

add styling to homepage
adds feildset to the form
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap
final styles on create form
Merge pull request #25 from rphuber/bootstrap

Bootstrap
adds image and css for background
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team1 into bootstrap