fixes merge conflict
fixes merge conflict
commiting to pull upstream
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