Merge branch 'master' of https://github.com/ahmadnourallah/pysploit-framework

Conflicts:
	PySploit.py
	core/interpreter.py
	core/module_interpreter.py

Author: ahmadnourallah

PySploit.py

@@ -79,7 +79,11 @@ def uninstall():
 def main():
     parser = ArgumentParser(prog='PySploit',usage='python3 PySploit.py [options]',  add_help=False)
     help_arguments = parser.add_argument_group('help arguments')
+<<<<<<< HEAD
     help_arguments.add_argument('-v', '--version', action='version', version="version 1.2")
+=======
+    help_arguments.add_argument('-v', '--version', action='version', version="version 1.1")
+>>>>>>> bec4e46061970e58833d21ccdfe8793e5457c876
     help_arguments.add_argument('-h', '--help', action='help', default=SUPPRESS, help='show this help message and exit.')
     optional_arguments = parser.add_argument_group('optional arguments')
     optional_arguments.add_argument('-c', '--create', dest='filename', required=False, help='create module sample')

README.md

@@ -71,10 +71,11 @@ you can read simple_sample.py file in samples directory for more informations
 This project is licensed under the GPL-2.0 License - see the LICENSE file for details
 
 # TODO
-* add new module
-* create wiki page for project
-* create man page for project 
+* add new modules
+* <strike>create wiki page for project</strike>
+* <strike>create man page for project</strike> 
 * make the code smarter
 * attract the developers to using the framework
-* create installer to the project
+* <strike>create installer to the project</strike>
+* create advanced payload (such as meterpreter in metasploit) help us in this task 
 > we always welcome the all pull requests

core/interpreter.py

@@ -1,4 +1,9 @@
 from utilities.color import * # import utilites
+<<<<<<< HEAD
+=======
+from utilities.screen_cleaner import clear # import utilites
+from core.banner import Banner # import banner
+>>>>>>> bec4e46061970e58833d21ccdfe8793e5457c876
 from core.main_completer import completer # completer import
 import os
 from imp import reload

core/module_interpreter.py

@@ -28,7 +28,11 @@ def listCompleter(text,state):
 
             self.listCompleter = listCompleter
     t = tabCompleter()
+<<<<<<< HEAD
     t.createListCompleter(["set", "exploit", "back", "check", "help", "info", 'banner', 'run', 'exec', 'clear','search'])
+=======
+    t.createListCompleter(["set", "exploit", "back", "check", "help", "info", 'banner', 'run', 'exec','clear'])
+>>>>>>> bec4e46061970e58833d21ccdfe8793e5457c876
     readline.set_completer_delims('\t')
     readline.parse_and_bind("tab: complete")
     readline.set_completer(t.listCompleter)