modified:   assets/movies.txt
	modified:   src/com/fsu/kevinfriedpig/LoadingView.java
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig

Conflicts:
	assets/movies.txt
	src/com/fsu/kevinfriedpig/LoadingView.java

commit to pull from old build
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig

Conflicts:
	src/com/fsu/kevinfriedpig/ALUGraph.java
	src/com/fsu/kevinfriedpig/LoadingView.java
	src/com/fsu/kevinfriedpig/SymGraph.java

getting old build up to date
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig
	modified:   res/layout/result_view.xml
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig
Merge branch 'master' of https://github.com/chrishax/KevinFriedPig