Added three sizes of boards. elopez1 added camera functionality
added files to commit
Merge branch 'master' of https://github.com/elopez1/puzzle15

Conflicts:
	AndroidManifest.xml
	gen/com/example/puzzle15/R.java
	project.properties
	res/layout/fragment_puzzle_new_game.xml
	res/values/strings.xml
	src/com/example/puzzle15/PuzzleClassicalBoardFragment.java
	src/com/example/puzzle15/PuzzleNewGameFragment.java