initial commit
Merge branch 'master' of https://github.com/veronikaveronika/July2013

Conflicts:
	.gitignore