Initial commit
Merge branch 'master' of github.com:thebw/sshxy-frontend
Merge branch 'develop'

Conflicts:
	.gitignore