Merge pull request #3 from ipri2013/master

update ignore
ignore
update
update #111
Test delete
Merge pull request #11 from juree/master

Test delete
freshStart
Merge pull request #14 from juree/master

freshStart
Create testiramBranch
Merge pull request #16 from juree/testbra

Create testiramBranch
delete testiram
imadadela
Merge pull request #18 from nejc92/master

newStartForReal
Merge pull request #9 from ipri2013/master

imaDaDela