remove med.cmd
test push to upstream
Merge branch 'master' of git://github.com/ManilaADM/medicine-inventory
test push 3
test push 4
test push 5
Test Commit1
Commit 2
Test commit 3

Change-Id: I439f5ed46c7105fc88006cc42637068507c3a4d0
Test Push

Change-Id: I54b29b98f03566db2fe880e81f652771115e3efc
Push3

Change-Id: Iff0eedf53d765c624609d8e0348084fc4f653d4b
Push4
Change-Id: I68bdfd66eb02dc5d47c79df9291aa23c9e5c735d
Commit target


Change-Id: I1984d99daa6f99fdba9019bf6c85379502617962
Delete BrianTestGit

Change-Id: I0009dd3f923c770ea27e5e4a6963a5f8b5d2b9f6
Local commit of untracked folder
Change-Id: Ifffa7dc170d5256199aa8c88177accb598f9f582
Added login page
Added login action
Added login config

Change-Id: Ic9895ea7c91adf1ea9d41ee03101b891db091292
Added a user form

Change-Id: If52f79843a9dadf55e7c2d63c37d3fcad002cea6
Added UI validation

Change-Id: Ic0fdf4a2b35f486eb981b6d32c73dff1aa7ac6a9
Merge branch 'master' of git://github.com/ManilaADM/medicine-inventory

Conflicts:
	.gitignore
	README
	logs/application.log
	project/target/streams/$global/ivyConfiguration/$global/out
	project/target/streams/$global/update/$global/inputs
	project/target/streams/$global/update/$global/out
	project/target/streams/$global/update/$global/output
	project/target/streams/compile/compile/$global/out
	project/target/streams/compile/copyResources/$global/out
	project/target/streams/compile/dependencyClasspath/$global/export
	project/target/streams/compile/exportedProducts/$global/export
	project/target/streams/compile/externalDependencyClasspath/$global/export
	project/target/streams/compile/internalDependencyClasspath/$global/export
	project/target/streams/compile/managedClasspath/$global/export
	project/target/streams/compile/unmanagedClasspath/$global/export
	project/target/streams/compile/unmanagedJars/$global/export
	project/target/streams/runtime/dependencyClasspath/$global/export
	project/target/streams/runtime/exportedProducts/$global/export
	project/target/streams/runtime/externalDependencyClasspath/$global/export
	project/target/streams/runtime/fullClasspath/$global/export
	project/target/streams/runtime/internalDependencyClasspath/$global/export
	project/target/streams/runtime/managedClasspath/$global/export
	project/target/streams/runtime/unmanagedClasspath/$global/export
	project/target/streams/runtime/unmanagedJars/$global/export

Change-Id: Ieca20a9176f39afeb699a52aca9219a7f2e395b5