d
fixed nav, added bg pic, and social buttons
merge
Merge branch 'master' of https://github.com/Akiorta/akiorta

Conflicts:
	public/css/style2.css
	public/images/web1.jpg
	public/index.html