initial commit - Andy
Merge branch 'master' of https://github.com/chan94306/Rubiks

Conflicts:
	src/com/example/viewfinderee368/DrawOnTop.java
	src/com/example/viewfinderee368/ViewfinderEE368.java
	src/cube/Cube.java
Random shit from Andy 7/5