Last changes to Main Story Board, and Porfolio
fixed merging conflicts thrusday night