Twitter updates
Merge branch 'master' of https://github.com/tara208/RPI

Conflicts:
	app/src/main/java/com/example/taranair/rpi/MainActivity.java