code style
placeholder for temp files
Merge branch 'master' of bitbucket.org:vodolaz095/site-shooter

Conflicts:
	routes/main.js