working project :)
merged changes
added ignore file