Merge remote-tracking branch 'origin/master'

# Conflicts: # html-site/css/main.css here are the commits for details
etl12003 · Feb 20, 2017 · 0f44440 · 0f44440
2 parents 0e4710c + e5309a1
commit 0f44440
Show file tree

Hide file tree

Showing 137 changed files with 427 additions and 7,634 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Wello-front-end/.DS_Store b/Wello-front-end/.DS_Store
diff --git a/Wello-front-end/.gitignore b/Wello-front-end/.gitignore
diff --git a/Wello-front-end/Wello-front-end/.DS_Store b/Wello-front-end/Wello-front-end/.DS_Store
diff --git a/Wello-front-end/Wello-front-end/README.md b/Wello-front-end/Wello-front-end/README.md
diff --git a/Wello-front-end/Wello-front-end/html-site/.DS_Store b/Wello-front-end/Wello-front-end/html-site/.DS_Store
diff --git a/Wello-front-end/Wello-front-end/html-site/form.html b/Wello-front-end/Wello-front-end/html-site/form.html
diff --git a/Wello-front-end/Wello-front-end/html-site/img/.DS_Store b/Wello-front-end/Wello-front-end/html-site/img/.DS_Store
diff --git a/Wello-front-end/Wello-front-end/html-site/scss/.DS_Store b/Wello-front-end/Wello-front-end/html-site/scss/.DS_Store
diff --git a/Wello-front-end/Wello-front-end/koala-config.json b/Wello-front-end/Wello-front-end/koala-config.json
diff --git a/Wello-front-end/html-site/.DS_Store b/Wello-front-end/html-site/.DS_Store
diff --git a/Wello-front-end/html-site/.editorconfig b/Wello-front-end/html-site/.editorconfig
diff --git a/Wello-front-end/html-site/.gitattributes b/Wello-front-end/html-site/.gitattributes
diff --git a/Wello-front-end/html-site/.gitignore b/Wello-front-end/html-site/.gitignore