Photo stuff
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Fighting Fragments Update #1
Fighting Update #2
Fighting Update #3
Fighting Updaet #4
Completed Fighting (Update #5)
Fighting Patches (Update 6)
UI Mockups Updated
Random Choices
Adaptive Menus in Story Tree (Fighting Update #7)
Fixed Adaptive Menu
Photo Comments
Tidied up comment margins
Hybrid of DBHandler and the Fighting update
Merge Part 1
Merge #2
Merge =/
=/
Merge =/