Adding a credits page to the main menu
Fixed strange lines left behind by previous merge
Merge branch 'master' into credits-page

Conflicts:
	SilkRoad/MainMenuView.h
	SilkRoad/ViewController.h
	SilkRoad/ViewController.m
Merge branch 'credits-page'