Merge branch 'master' into queries

fac-14 · Sep 16, 2018 · c3669ef · c3669ef
2 parents 715725c + 85d057b
commit c3669ef
Show file tree

Hide file tree

Showing 21 changed files with 2,347 additions and 1,473 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,4 +64,9 @@ typings/
 .DS_Store
 
 # yamls
-*.yml
+*.yml
+
+# sass cache
+
+/.sass-cache
+.sass-cache
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
 # tech-access
 Art, Dom, Kate, Sangita Week 10 - 13 project
 
-[![codecov](https://codecov.io/gh/fac-14/tech-access/branch/master/graph/badge.svg)](https://codecov.io/gh/fac-14/tech-access)
-
-[![Build Status](https://travis-ci.org/fac-14/tech-access.svg?branch=master)](https://travis-ci.org/fac-14/tech-access)
+[![codecov](https://codecov.io/gh/fac-14/tech-access/branch/master/graph/badge.svg)](https://codecov.io/gh/fac-14/tech-access) [![Build Status](https://travis-ci.org/fac-14/tech-access.svg?branch=master)](https://travis-ci.org/fac-14/tech-access) 
+[![forthebadge](https://forthebadge.com/images/badges/built-with-love.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/built-by-codebabes.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/no-ragrets.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/uses-git.svg)](https://forthebadge.com)
 
 ## Team roles (week 10)
 - Researcher - reviewing what other groups are doing; identifying best practice: Artemis (MisArray)