Changed build tools version to 19.1.0 and added necessary support libraries.
Changed build tools version to 19.1.0 and added necessary support libraries.
Adding support libraries for 19.1.0.
Merge branch 'master' of github.com:wujessica/Routime with 'development'

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	routime/routime.iml
Cleaned merge conflicts in gradle.
test to see if pushing works
changed margin size to zero
Created a custom adapter for listexercises.
added colours and buttons
Integrated Caligraphy library to use custom fonts easier.
changed colours and size of buttons
test
matched the style to all the other activities
changed fonts
Created the file manager to save workouts.
Added screen for saved routines and beginning to link up file managing.
Preparing to merge with development to reflect list adapter changes.
File is now saved and its title can be viewed afterward.
Load routines displays saved routines when pressed. Able to create and delete files that hold different routines.
Displays message when there are no saved routines in My Routines.