new test file
test
test

Merge branch 'master' of https://github.com/MikeGonzalez2015/MikeandSicen

Conflicts:
	test.r
deleted

Merge branch 'master' of https://github.com/MikeGonzalez2015/MikeandSicen

Conflicts:
	test.r