Just for merging with Diego's classes.
Merge branch 'master' of https://github.com/jzaldumbide/mobilecomputing

Conflicts:
	src/au/edu/unimelb/comp90018/brickbreaker/framework/Graphics.java
	src/au/edu/unimelb/comp90018/brickbreaker/framework/Pixmap.java

Just committing and merging changes.
Merging... sorry for heaps of merging... but I'm learning how to do it by Git console.