Fixed logic error in stories_controller.rb def new that had else render the company form if there was no user type. Added an else statement to redirect to the root and a elsif if @user.user_type == company.
re-adds forms and logic for split
Merge pull request #35 from andrewfritz86/adding_forms_again

re-adds forms and logic for split
Changed stories-controller.rb def show to add elsif for individual story and else to go to root path.
Added test for GET stories for an individual form. Also x'd out that test and form test for get company form due to lack of session data giving false results.
Added test for GET stories for an individual form. Also x'd out that test and form test for get company form due to lack of session data giving false results.
Fixed typo is GET story individual form.
x'd out tests due to lack of session tracking functionality.
x'd out tests due to lack of session tracking functionality.
Merge branch 'master' of github.com:rnparks/tojamers into mikes_commit
merge
Conflicts:
	app/views/stories/company_story.html.erb
Merge pull request #37 from mconiaris/test_features

Test features
Merge branch 'master' of github.com:rnparks/tojamers into mikes_commit
merge
adding new css