test
Merge branch 'origin/Kim2'
Merge branch 'origin/master'
Merge branch 'origin/Aries'
Merge branch 'origin/master'
Added javadoc and comments

This file is sent in to the teacher for deadline1, 2014-02-07
removed some files
removed old stuff and fixed image path
moved images
old readme
Merge branch 'origin/master'

Conflicts:
	Assets/readme.txt