Merge branch 'master' of git@github.com:Sayo0nara/voronina_store.git
Merge pull request #3 from Sayo0nara/master

23.10.2013
Merge branch 'master' of git@github.com:Sayo0nara/voronina_store.git
testing php Storm...
testing php Storm...
testing php Storm...
27.10.2013
Merge branch 'master' of github.com:paramaribo/voronina_store
Merge branch 'master' of github.com:Sayo0nara/voronina_store

Conflicts:
	db_sql_backup/backup 23.10.2013 yarik.sql