added parameter for createFile
Merge branch 'lareina-storage'

Conflicts:
	src/tareas/storage/StorageReader.java
	storage.json
merge master
Added skeleton for the view types that we are planning to support
Merge branch 'master' into junhao-finish-unittesting