commit app
Merge branch 'master' of https://github.com/njb26/3093_Software_Engineering_2013 into Curtis_Branch

Merging new Workspace folder for app
MemeApp folder add
Removing MemeApp
Part of main activity
curt commit

adding curt's files