Removed gotcha
Merge branch 'master' of github.com:FrankARod/Finance101 into ryan
Merge branch 'master' of github.com:FrankARod/Finance101 into ryan
Merge branch 'master' of github.com:FrankARod/Finance101 into ryan
trying to include transaction create forms onto simulation create view page
but running into alot of undefined variable errors
Merge branch 'master' of github.com:Finance101/Finance101 into ryan
Created page introducing users to our app
Finished chart layout for now

Added moment.js to public/js directory
Merge branch 'frank' of github.com:Finance101/Finance101 into mary
Merge pull request #4 from Finance101/mary

Mary
Merge branch 'master' of github.com:Finance101/Finance101 into mary
Added package oauth-4-laravel, run composer update on your vagrant boxes
Moved login and logout actions to the AuthController
Added check for an ajax request in the store action of the SimulationsController.
Changed calls to HomeController login actions to AuthController login actions.
Changed HomeController@doLogin to AuthController@doLogin
Cleaned up code, changed interval from magic number to a constant for readability
Initial getStarted form & actions
Changed twitter and login buttons to anchor tags on login page

Added route to facebook login action
Merge branch 'master' of github.com:Finance101/Finance101 into frank

Conflicts:
	app/config/app.php
	app/routes.php
	app/views/layouts/master.blade.php
	app/views/login.blade.php