functional and non-functional requierements
Merge remote-tracking branch 'origin/master'
Merge pull request #8 from badeleux/master

functional and non-functional requierements