Really not sure what files I need to gitignore but I got rid of most of
them and added my code.

Merge branch 'master' of github.com:JamieH/ServerButton

Conflicts:
	.gitignore