removing test file
initial commit
Merge branch 'master' of github.com:manilacoders/devcup2014

Conflicts:
	test.txt