..
...
nadia 1 push
removed test file
added .gitignore for 'var' folder
renamed local.xml.sample to local.xml to show eventual errors
...
Merge remote branch 'origin/master'

Conflicts:
	.gitignore
Test module plus template draft.
More template
them templatez
removed old Oliver css
Update .gitignore
...
Merge remote branch 'origin/master'
..
More template
Product view layout
added xml file for test module
still working on the module, just preliminary stuff