Created Account page where there is a link to edit my profile
removed unwanted file
removed some hidden files
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch dj/homepage
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	deleted:    app/controllers/default_controller.rb~
#	deleted:    app/views/default/index.html.erb~
#	deleted:    config/routes.rb~
#
Merge branch 'master' of https://github.com/amandamcwhorter/team_aura into dj/accountpage

Conflicts:
	config/routes.rb
Merge branch 'dj/accountpage'
Merge branch 'master' of https://github.com/amandamcwhorter/team_aura