added future work
merged
Merge branch 'master' of https://github.com/sagieske/AA1
Merge branch 'master' of https://github.com/sagieske/AA1

Conflicts:
	two/report/Assignment2_Group4.tex
	two/report/bibliography.bib
working on encoding
encoded version?
Merge branch 'master' of https://github.com/sagieske/AA1