Merge branch 'master' of github.com:angjerden/skoodiapp

Conflicts:
	.gitignore