SB Updated configs to allow the pulled project to run
SB merged upstream into my local branch
SB Removed the extra merging files from my local directory
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment

Conflicts:
	config/application.config.php
SB - Updated the Plans module.  The view page and modify page are now operational.
SB - Made the add page functional.
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
SB - Added the Action drop down menu to all the plans screens.
SB - Add in the new select drop down components.
SB - Add plan Session variables
SB - Added the right side of the screen
SB - Added the add meta description page
SB - Adding in the new left hand components
SB - Added the upload directory to the .gitignore file
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
SB - Included the new left hand side to all the plans pages
Merge branch 'devapp'
SB - Added functionality to create multiple outcomes in the database