This is Fang commit
Merge pull request #4 from Gannon-University/seanworking

this is sean's
Delete file_conf.txt
Rename file_conf.txt.orig to file_conf.txt
Merge pull request #5 from Gannon-University/master

sean