nav bar position changed
merge fixed
homepage model changed
footer
Merge branch 'stephys'
merge conflicts fixed
user authentication added
fixing merge oscar
merge with oscar conflicts fixed