Had some conflicts pulling Shashank's changes, had to checkout his code
and reset it as my branch then commit the branch to master.
Completed Media Player. [Has some bugs]
Merge branch 'master' of https://github.com/tblauser/BlueHome.git

Conflicts:
	BlueHome/bin/classes/com/senior/bluehome/MainActivity.class
	BlueHome/bin/classes/com/senior/bluehome/R$drawable.class
	BlueHome/bin/classes/com/senior/bluehome/R$id.class
	BlueHome/bin/classes/com/senior/bluehome/R$layout.class
	BlueHome/bin/classes/com/senior/bluehome/R$menu.class
	BlueHome/bin/classes/com/senior/bluehome/R$string.class
	BlueHome/bin/classes/com/senior/bluehome/R$style.class
	BlueHome/res/layout/media_player.xml
	BlueHome/src/com/senior/bluehome/Settings.java
Fixed some bugs with media player layout.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BlueHome/bin/classes/com/senior/bluehome/R$layout.class
	BlueHome/bin/classes/com/senior/bluehome/R$menu.class
	BlueHome/bin/classes/com/senior/bluehome/R$string.class
	BlueHome/bin/classes/com/senior/bluehome/R$style.class
	BlueHome/bin/classes/com/senior/bluehome/Settings.class
	BlueHome/gen/com/senior/bluehome/R.java
	BlueHome/src/com/senior/bluehome/Settings.java