page.tpl
Merge branch 'master' of https://github.com/hyphenlab/clientela
style changes
style changes again
newsletter page design changes
commit all files
Merge branch 'master' of https://github.com/hyphenlab/clientela

Conflicts:
	sites/all/themes/custom/hlab_store_owner/css/styles.css
Merge pull request #8 from hyphenlab/master

changes in css file