- initial commit
Merge branch 'master' of github.com:parishphilp/swellapp

Conflicts:
	.gitignore
- merge