Beep boop
Merge branch 'master' of https://github.com/kelleyb/SwagTracker

Conflicts:
	home.html
Merge branch 'master' of https://github.com/kelleyb/SwagTracker
Colors; Awww yisss
Merge branch 'master' of https://github.com/kelleyb/SwagTracker

Conflicts:
	home.html
Merge branch 'master' of https://github.com/kelleyb/SwagTracker
Merge branch 'master' of https://github.com/kelleyb/SwagTracker