internet lol internet
Merge remote-tracking branch 'upstream/master' into internet

Conflicts:
	Standupfile
Merge pull request #4 from nesQuick/internet

internet lol internet
Merge remote-tracking branch 'upstream/master' into megaman

Conflicts:
	Standupfile