updated controllers, models, views, and javascript to get editors working
resolving conflicts
fixing commits
added comments
Merge pull request #24 from stevenmiller888/master

updated controllers, models, views, and javascript to get editors working
commented the .js file
Merge pull request #25 from stevenmiller888/master

commented the .js file
added a ruby interpreter with output
Merge pull request #26 from stevenmiller888/master

added a ruby interpreter with output
fixed javascript loading problem
Merge pull request #27 from stevenmiller888/master

fixed javascript loading problem
added users show page
erge
resolving conflicts
added comments
added a ruby interpreter with output
starting with paperclip, added show page for users, now edit broken
more things
adding padding to bottom to adjust for footer
fixed footer, my profile and edit account working