Fixed stuff
Merge branch 'master' of https://github.com/luntdotp/Port

Conflicts:
	index.html
	port.css