Made changes
Merge pull request #4 from EF0rs/Project-2-Branch

Made changes. Project 2 will be implemented