Initial commit
Initial Commit
Merge branch 'master' of https://github.com/puhettuhskucf/Technolotrix
Added first bits of site to repo
Syncing current site with github - added all files
Committing bootstrap file
Added python simplehttpserver to bootstrap file
Added new shell script names, added resume.html, added threeman
Update ftp_start.sh
Fixing emergency git repair
Fixing commit error
Merge branch 'master' of https://github.com/puhettuhskucf/Technolotrix
Rm ~ file
Finished round 1 of auto page maker
Finished auto page maker
Fixed bugs in missing js from template
initial commit
Merge branch 'master' of https://github.com/puhettuhskucf/Technolotrix
Merge branch 'master' of https://github.com/puhettuhskucf/site

Conflicts:
	LICENSE