Hello
Fixed margin issues
Merge branch 'master' of github.com:TennisKid/Alpha

Conflicts:
	static/css/style.css
Merge branch 'master' of github.com:TennisKid/Alpha
Made basic functionality for titling the nav. bar