merge, gitignore
Merge branch 'master' of https://github.com/agustincl/timefront
Adding missing files
Timefront initials
Integrado el código del proyecto "clases", eliminado casi todo lo que no se usa
Timeline initial
Controller Index and Error
Fixed Error controller
Timeline view-controller
Merge pull request #2 from nakasoft/master

Timefront initials
merge
Merge branch 'paznar-master'
Acutaliza README.md hasta Step4
Merge branch 'master' of https://github.com/samuelgi/timefront into samuelgi-master

Conflicts:
	Modules/Application/Src/Application/Layouts/index.phtml
	autoload.php
	configs/autoload/application.global.php
	configs/autoload/application.local.php
	configs/global.php
	configs/local.php
	modules/Application/config/application.global.php.dist
	modules/Application/src/Application/controllers/Error.php
	modules/Core/src/Core/Application/Application.php
	modules/Core/src/Core/Module/ModuleManager.php
	modules/Core/src/Core/Router/ParseUrl.php
	public/index.html
	public/index.html.bak
	public/index.php
Merge branch 'samuelgi-master'
file name fix
Merge branch 'master' of https://github.com/erremesse/timefront into erremesse-master

Conflicts:
	.project
	configs/autoload/application.global.php
	modules/Application/src/Application/controllers/timeline.php
	modules/Application/src/Application/layouts/timeline.phtml
Merge branch 'erremesse-master'
Merge pull request #6 from jclahuertar/master

Actualiza README.md hasta Step.4
Merge pull request #7 from 814ckc0d3/patch-1

file name fix