moved menus to different html, but there is still a conflict
fixed menus
re-organized file structure, html
moved json
wrote commented out angular version of social buttons
reorganized folder structure and js files
minor text changes
Merge branch 'angular'

Conflicts:
	js/main.js