sets up first commit from laptop
reverts links to Swarm TV as opposed to Digital Dialogues
tidies up files to conform with server
settles the tracking of a DS_Store file
tests out ffmpeg to create videos for Firefox
replaces divs for the toolbox with iframe alternatives
sorts conflicts to do with iframes
prepares directories for hosted server

Conflicts:
	private/codeigniter/application/models/elements_model.php
	public_html/.DS_Store
Delete .gitignore
settles files after transfer
conforms iframes to codeigniter framework
includes iframes in code igniter framework
adds iframe.php controller
creates iframe editing text with all parameters
adds new textEditor.php
implements a copy and remove facility when SHIFT clicking
corrects the parameter numbers for SHIFT editing
implements copy command to any page
corrects height and width when element is resized
sorting readme.md switch conflict