trying to merge with master

trying to push my code up to repo, if this works i should know how to merge conflicts from now on.. if it doesn't then i don't even know