Merge pull request #34 from jloehman/mallory

Mallory
minor work on ajax with omar, outling where functionality exists
position ajax functinality with help from omar, very basic
revised
implement of ajax in budgetitemcontroller, not working
Merge pull request #35 from jloehman/jason

Jason
implement of ajax in budgetitemcontroller, not working
Merge pull request #36 from jloehman/jason

implement of ajax in budgetitemcontroller, not working
Stripped out old bootstrap and implemented new bootstrap in the user_master blade. Worked on the view in the budget_item blade and rearranged the tables. Stripped out the old bootstrap template in the personal_admin blade. Updated the budget_item css file. Created the user_nav css file to style the navigation bars for the personal_admin views.
Merge branch 'master' into lindsey

Conflicts:
	app/views/pages_folder/budget_item.blade.php
Merge pull request #37 from jloehman/lindsey

Stripped out old bootstrap and implemented new bootstrap in the user_mas...
Created a new controller to create and view parties and welcome page. Added logic for login routing.
Added rules in party model.