backup
Merge branch 'master' of http://github.com/sagieske/AA1
updated future work
Merge branch 'master' of http://github.com/sagieske/AA1