Initial commit
Merge branch 'master' of github.com:fluffy88/TV-Guide-Common

Conflicts:
	.gitignore