Merging of the different versions
Actually merged the files... srry for last useless commit
Merge branch 'master' of
https://github.com/kylejamesross/CMPUT301W13T09.git

Conflicts:
	CMPUT301Project/gen/com/cmput301w13t09/cmput301project/R.java
	CMPUT301Project/src/com/cmput301w13t09/cmput301project/BogoPicGen.java
fix
Merging Lanre's code with the rest of the code