activ and Available added
Merge branch 'master' of https://github.com/aronb12/EvaluationApp