mock-up for potential sidebar
renaming img files
slightly editted text formatting in sidebar
small changes
new front end stuff - shiny wax
sorta functioning side-bars
Basic changes to main-controller.  Not working yet, but all the base functionality should be in place to now work with UI.
About to add accordion functionality.
About to delete code that is not being used
Working sidebar
navbar option visibility and meals/friends sidebar visibility now functions correctly (to be immediately broken by kevin)
Merge branch 'sidebar_fun' into ui_overhaul

Conflicts:
	app/client/css/main.css
	app/client/js/controllers/index-controller.js
	app/client/js/controllers/main-controller.js
	app/client/views/main.html
Working on small bugs
Sidebar functionality complete
Deleted mealTime.json
Merge commit 'd5003281cc5668363684067663ae1453ff004d1b' into ui_overhaul

Conflicts:
	app/client/img/restaur_going_friend.png
	app/client/img/restaur_select_friend.png
	app/client/img/restaur_selected_friend.png
	app/client/js/controllers/index-controller.js
	app/client/js/controllers/main-controller.js
Some quick merges, and fixes, features, memory leak issues fixes
Merge remote-tracking branch 'origin/ui_overhaul' into ui_overhaul

Conflicts:
	app/client/js/controllers/main-controller.js
Merge remote-tracking branch 'origin/ui_overhaul' into ui_overhaul
Fixed one merge issue of duplicate function, and fixed database failing due to unique key issues