Merge pull request #1 from CMPUT301F13T03/master

Sync
Rename README.md to TestFile.txt

For marks
Merge remote-tracking branch 'cmput/master'
Update and rename TestFile.txt to README.md

Now it's a real readme again.
Merge pull request #3 from afontaine/master

Update and replace testfile.txt to README.md
Updated description.
Merge pull request #9 from Jtfinlay/master

Updated description.
Create LICENSE for CMPUT401T03F13/#8

Using MIT license. Please add proper header to all files from now on.
Update LICENSE
Merge pull request #10 from afontaine/master

Create LICENSE for CMPUT401T03F13/#8
Create .gitignore

Only contains Java and Android. Everyone should create one global one for their IDE and OS of choice.
Merge pull request #11 from afontaine/master

Create .gitignore
Meeting minutes for Oct 16
Merge remote-tracking branch 'origin/master'
Formatting
Removed meeting minutes, belong in wiki
Finished
Updated README
Initial creation of project in IntelliJ

I don't want to see no Eclipse crud in this, folks.
Merge pull request #13 from afontaine/master

Initial "Hello World" app