init
Merge branch 'master' of github.com:timmyArch/gallery_new

Conflicts:
	LICENSE