minor style change
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
working through broken app bugs
fixing poor merges
merge conflict fix
Merge pull request #23 from Mathdrquinn/master

i hope we're almost there
merge error corrections to index and workspace.xml files