TMAR MMIXTA

ya hice la tmar mixta
Merge remote-tracking branch 'origin/master'

Conflicts:
	NewAplication/InternalForm.Designer.cs
	NewAplication/InternalForm.cs