Modified ignore file and deleted uneccssary junk
stinkin .suo
Merge branch 'Roger'

Conflicts:
	.gitignore