.idea
app/cache
app/logs
.DS_Store
.netbeans
desktop.ini
somescript.php
New version of homework1. Less code with same result
Merging w/ branch 'v0.0.1' to add to master branch new version of homework

Conflicts:
	.gitignore