Continue adding error checking
fix merge
fix merge of yunita's datasource
Merge branch 'master' of https://github.com/Cmput291Fa14TeamNYC/Project1
Merge branch 'master' of https://github.com/Cmput291Fa14TeamNYC/Project1
Merge branch 'master' of https://github.com/Cmput291Fa14TeamNYC/Project1
fix merge
copy files to project1main