1106
1106
Merge branch 'master' of github.com:nickz8031/vilcock

Conflicts:
	bin/classes.dex
	bin/classes/com/concordiatechnology/vilcock/MainActivity$PlaceholderFragment.class
	bin/classes/com/concordiatechnology/vilcock/MainActivity.class
	bin/classes/com/concordiatechnology/vilcock/R$layout.class
	bin/classes/com/concordiatechnology/vilcock/R$menu.class
	bin/classes/com/concordiatechnology/vilcock/R$string.class
	bin/classes/com/concordiatechnology/vilcock/R$style.class
	bin/resources.ap_
	gen/com/concordiatechnology/vilcock/R.java
	res/layout/main_fragment.xml