correcting files
working in eclipse now
Merge branch 'master' of
https://github.com/mrjeremyt/AES_generic_text_file

Conflicts:
	.project
just getting things sorted
just trying to get the repo to push