add A1 and A2
Merge branch 'master' of https://github.com/martylee/CSC309