getting updates from master#33

Open

RachelRamirez wants to merge 3 commits intoAFIT-R:masterfrom

RachelRamirez:master

Commits on Jan 10, 2018

Merge pull request #1 from AFIT-R/master
RachelRamirez
authored

Commits on Jan 31, 2018

Merge pull request #2 from AFIT-R/master
RachelRamirez
authored

Commits on Mar 7, 2018

Merge pull request #3 from AFIT-R/master
RachelRamirez
authored