test
Merge branch 'master' of https://github.com/josefernandotolentino/mar-net-ram

Conflicts:
	static/AwsWebApp1/AwsWebApp1.v12.suo
	static/AwsWebApp1/AwsWebApp1/bin/AwsWebApp1.dll
	static/AwsWebApp1/AwsWebApp1/bin/AwsWebApp1.pdb
	static/AwsWebApp1/AwsWebApp1/obj/Debug/AwsWebApp1.dll
	static/AwsWebApp1/AwsWebApp1/obj/Debug/AwsWebApp1.pdb