added selected to options and moved options to option values to array in controller
re-added year to footer
reapplied single nav styles
removed .tmp from untracked files
fixed merge conflicts
updated styles
Merge branch 'master' of github.com:SeboLith/mean-foundation into reggie
update
stype fix