Header stuff but not quite working
Merge branch 'master' of https://github.com/rbirdman/Dropbox

# By bchase524 (6) and others
# Via bchase524 (2) and herrmannator05 (1)
* 'master' of https://github.com/rbirdman/Dropbox:
  Check
  Only have one file for calendar. Remove duplicate file to avoid confusion
  got rid of buttons where needed, fixed minor link bugs
  Rename html files to ruby files to become dynamic
  Fixed syntax error
  Commiting erb for calender
  Calender Items Update
  Calender Items update
  Slight update on Calender Items
  ToDo view completed
  Create view for user-search
  Undo unwanted files

Conflicts:
	app/views/users/user-search.html.erb