merging problem resoved
Merge pull request #10 from billy1339/laurenfazah-master

merging conflicts resolved
solved conflicts for merge