initial commit
Merge branch 'master' of https://github.com/antavelos/instagram

Conflicts:
	.gitignore