Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18

Conflicts:
	.gitlab-ci.yml
	test-ci.sh

.gitlab-ci.yml

-# This file is a template, and might need editing before it works on your project.
-# use the official gcc image, based on debian
-# can use verions as well, like gcc:5.2
-# see https://hub.docker.com/_/gcc/
-image: gcc
-
 build:
   stage: build
   script:
@@ -13,4 +7,4 @@ build:
 test:
   stage: test
   script:
-    - ./test-ci.sh
+    - bash test-ci.sh

test-ci.sh

@@ -4,4 +4,4 @@ PROJECT_ROOT=$(pwd)
 export PROJECT_ROOT
 
 # Quad
-quad/test-ci.sh || exit 1
+bash quad/test-ci.sh || exit 1