Styling?
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5

Conflicts:
	css/styles.css
Fixed these files