First commit.
Merge branch 'master' of https://github.com/jaredcrossley/alma_phase2