routine adding added
fixed commit error
Merge branch 'master' of https://github.com/znicholson92/DYELNet2.git

Conflicts:
	src/com/example/dyel_net/MainActivity.java
	src/com/example/dyel_net/RoutineView.java
	src/com/example/dyel_net/connection.java