Fixed atom builder
Merge branch 'master' of https://github.com/jzabonik/cs446_team12

merged branch