social link changes
conflict resolved
fix
Updated about page
fix
Added terms of service page
img deleted
conflict resolved
Added privacy policy page
Updated links
Merge branch 'master' of https://github.com/hlboy4ik/picreel

Conflicts:
	about.htm
	index.htm
Added google analytics and updated styles
Merge branch 'master' of https://github.com/stasmala/picreel into stasmala-master
changes
video added
conflict resolved
footer img deleted
Refactored code
fix