Merge pull request #1 from marinamarina/dev

initial messy commit
Made php code more readable
gitignore applied
Merge branch 'php' of https://github.com/marinamarina/css-to-sass
minor
merge
Merge pull request #4 from marinamarina/python

started converting to python
Update and rename test.py to test.php
Update and rename convert.py to convert.php
Rename expect.py to expect.php
Rename test_data.py to test_data.php
Merge branch 'master' of https://github.com/marinamarina/css-to-sass

Conflicts:
	.idea/workspace.xml
	convert.php
	test.py
minor