thing
Merge branch 'master' of github.com:szarmes/448Project
References controller tests green