Re-commited entire project
Added resources folder for testing
Fixed unmerged paths