Addition of profile page with styling, and changes to positioning of elements on index page
Addition of profile page with styling, and changes to positioning of elements on index page
Addition of profile page with styling, and changes to positioning of elements on index page
Merge branch 'master' of github.com:Jon1213/activity_app

Conflicts:
	app/assets/stylesheets/home.css.scss
	app/views/home/index.html.erb
Merge pull request #15 from sufisidhu/master

addition of profile page + edits to positioning on index page with elements
removed cached log
Inserted activity creation form in the user's profile modal
Merge pull request #16 from jangelroa/master

Inserted activity creation form in the user's profile modal
updating urls for heroku, default black background
fixing stuff
updated stuff;
fixed clock
changed color of flash messages
removed binding pry to merge
changed stylesheet/application to erb for heroku